Главная Обзор Помощь
Зарегистрироваться Войти
J1X
/
huginn
Следить 2
В избранное 0
Ответвить 0

Просмотр исходного кода
fix spec that fails with daylight savings time

Andrew Cantino лет %!s(int64=10): %!d(string=назад)
Родитель
0a557332f6
Сommit
626c13ef52
3 измененных файлов с 30 добавлено и 14 удалено
Показать статистику Diff
  1. 8 0
      Gemfile.lock
  2. 21 13
      db/schema.rb
  3. 1 1
      spec/models/agent_spec.rb

+ 8 - 0
Gemfile.lock
Просмотреть файл 

@@ -141,6 +141,8 @@ GEM
141 141 
       activesupport (>= 3.0.0)
142 142 
     kramdown (1.1.0)
143 143 
     libv8 (3.16.14.3)
144 
+    macaddr (1.6.7)
145 
+      systemu (~> 2.6.2)
144 146 
     mail (2.5.4)
145 147 
       mime-types (~> 1.16)
146 148 
       treetop (~> 1.4.8)
 
@@ -217,6 +219,8 @@ GEM
217 219 
       erector
218 220 
       nokogiri
219 221 
       rest-client
222 
+    ruby-growl (4.1)
223 
+      uuid (~> 2.3, >= 2.3.5)
220 224 
     rufus-scheduler (3.0.2)
221 225 
       tzinfo
222 226 
     safe_yaml (0.9.5)
 
@@ -243,6 +247,7 @@ GEM
243 247 
       rack (~> 1.0)
244 248 
       tilt (~> 1.1, != 1.3.0)
245 249 
     system_timer (1.2.4)
250 
+    systemu (2.6.4)
246 251 
     term-ansicolor (1.2.2)
247 252 
       tins (~> 0.8)
248 253 
     therubyracer (0.12.0)
 
@@ -277,6 +282,8 @@ GEM
277 282 
     uglifier (2.1.2)
278 283 
       execjs (>= 0.3.0)
279 284 
       multi_json (~> 1.0, >= 1.0.2)
285 
+    uuid (2.3.7)
286 
+      macaddr (~> 1.0)
280 287 
     warden (1.2.3)
281 288 
       rack (>= 1.0)
282 289 
     webmock (1.13.0)
 
@@ -325,6 +332,7 @@ DEPENDENCIES
325 332 
   rspec
326 333 
   rspec-rails
327 334 
   rturk
335 
+  ruby-growl
328 336 
   rufus-scheduler
329 337 
   sass-rails (~> 3.2.3)
330 338 
   select2-rails

+ 21 - 13
db/schema.rb
Просмотреть файл 

@@ -14,18 +14,18 @@
14 14 
 ActiveRecord::Schema.define(:version => 20140216201250) do
15 15
16 16 
   create_table "agent_logs", :force => true do |t|
17 
-    t.integer  "agent_id",                         :null => false
18 
-    t.text     "message",                          :null => false
19 
-    t.integer  "level",             :default => 3, :null => false
17 
+    t.integer  "agent_id",                                             :null => false
18 
+    t.text     "message",           :limit => 16777215,                :null => false
19 
+    t.integer  "level",                                 :default => 3, :null => false
20 20 
     t.integer  "inbound_event_id"
21 21 
     t.integer  "outbound_event_id"
22 
-    t.datetime "created_at",                       :null => false
23 
-    t.datetime "updated_at",                       :null => false
22 
+    t.datetime "created_at",                                           :null => false
23 
+    t.datetime "updated_at",                                           :null => false
24 24 
   end
25 25
26 26 
   create_table "agents", :force => true do |t|
27 27 
     t.integer  "user_id"
28 
-    t.text     "options"
28 
+    t.text     "options",               :limit => 16777215
29 29 
     t.string   "type"
30 30 
     t.string   "name"
31 31 
     t.string   "schedule"
 
@@ -37,9 +37,9 @@ ActiveRecord::Schema.define(:version => 20140216201250) do
37 37 
     t.datetime "updated_at",                                                     :null => false
38 38 
     t.text     "memory",                :limit => 2147483647
39 39 
     t.datetime "last_webhook_at"
40 
-    t.integer  "keep_events_for",                             :default => 0,     :null => false
41 40 
     t.datetime "last_event_at"
42 41 
     t.datetime "last_error_log_at"
42 
+    t.integer  "keep_events_for",                             :default => 0,     :null => false
43 43 
     t.boolean  "propagate_immediately",                       :default => false, :null => false
44 44 
   end
45 45 
 
@@ -47,11 +47,19 @@ ActiveRecord::Schema.define(:version => 20140216201250) do
47 47 
   add_index "agents", ["type"], :name => "index_agents_on_type"
48 48 
   add_index "agents", ["user_id", "created_at"], :name => "index_agents_on_user_id_and_created_at"
49 49
50 
+  create_table "contacts", :force => true do |t|
51 
+    t.text     "message"
52 
+    t.string   "name"
53 
+    t.string   "email"
54 
+    t.datetime "created_at", :null => false
55 
+    t.datetime "updated_at", :null => false
56 
+  end
57 
+
50 58 
   create_table "delayed_jobs", :force => true do |t|
51 59 
     t.integer  "priority",                       :default => 0
52 60 
     t.integer  "attempts",                       :default => 0
53 61 
     t.text     "handler",    :limit => 16777215
54 
-    t.text     "last_error"
62 
+    t.text     "last_error", :limit => 16777215
55 63 
     t.datetime "run_at"
56 64 
     t.datetime "locked_at"
57 65 
     t.datetime "failed_at"
 
@@ -66,11 +74,11 @@ ActiveRecord::Schema.define(:version => 20140216201250) do
66 74 
   create_table "events", :force => true do |t|
67 75 
     t.integer  "user_id"
68 76 
     t.integer  "agent_id"
69 
-    t.decimal  "lat",                            :precision => 15, :scale => 10
70 
-    t.decimal  "lng",                            :precision => 15, :scale => 10
71 
-    t.text     "payload",    :limit => 16777215
72 
-    t.datetime "created_at",                                                     :null => false
73 
-    t.datetime "updated_at",                                                     :null => false
77 
+    t.decimal  "lat",                              :precision => 15, :scale => 10
78 
+    t.decimal  "lng",                              :precision => 15, :scale => 10
79 
+    t.text     "payload",    :limit => 2147483647
80 
+    t.datetime "created_at",                                                       :null => false
81 
+    t.datetime "updated_at",                                                       :null => false
74 82 
     t.datetime "expires_at"
75 83 
   end
76 84

+ 1 - 1
spec/models/agent_spec.rb
Просмотреть файл 

@@ -502,7 +502,7 @@ describe Agent do
502 502 
             @agent.keep_events_for = 3
503 503 
             @agent.save!
504 504 
           }.should change { @event.reload.expires_at }
505 
-          @event.expires_at.to_i.should be_within(2).of(1.days.from_now.to_i)
505 
+          @event.expires_at.to_i.should be_within(60 * 61).of(1.days.from_now.to_i) # The larger time is to deal with daylight savings
506 506 
         end
507 507
508 508 
         it "nulls out expires_at when keep_events_for is set to 0" do